a93ae0bab09d5263941553296c584fc0a1e3246e,app/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java,DexCollectionService,getWatchStatus,#,715

Before Change


    public static DataMap getWatchStatus() {
        DataMap dataMap = new DataMap();
        dataMap.putString("lastState", lastState);
        dataMap.putLong("timestamp", last_transmitter_Data.timestamp);
        dataMap.putInt("mStaticState", mStaticState);
        dataMap.putBoolean("static_use_transmiter_pl_bluetooth", static_use_transmiter_pl_bluetooth);
        dataMap.putBoolean("static_use_rfduino_bluetooth", static_use_rfduino_bluetooth);
        dataMap.putInt("last_battery_level", last_battery_level);
        dataMap.putLong("retry_time", retry_time);
        dataMap.putLong("failover_time", failover_time);

After Change


    public static DataMap getWatchStatus() {
        DataMap dataMap = new DataMap();
        dataMap.putString("lastState", lastState);
        if (last_transmitter_Data != null) dataMap.putLong("timestamp", last_transmitter_Data.timestamp);
        dataMap.putInt("mStaticState", mStaticState);
        dataMap.putInt("last_battery_level", last_battery_level);
        dataMap.putLong("retry_time", retry_time);